dgit.raspbian.org Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3726838 0080dc6)

author	Chong Yidong <cyd@stupidchicken.com>
	Fri, 8 Apr 2011 18:53:26 +0000 (14:53 -0400)
committer	Chong Yidong <cyd@stupidchicken.com>
	Fri, 8 Apr 2011 18:53:26 +0000 (14:53 -0400)
commit	6b8bc570715801cb194dc4273370eab87628e8bf
tree	01e4531fd38069dffbfb0150a2a596ddd8de2bd2	tree \| snapshot
parent	3726838a9cca22d420036cd2462398f54318f5d5	commit \| diff
parent	0080dc6bd919f83c036bb6072800032b1723b248	commit \| diff

Merge changes from emacs-23 branch

12 files changed:

doc/emacs/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/emacs/display.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/buffers.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/minibuf.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/positions.texi	diff1 \|	diff2 \|	blob \| history
etc/NEWS.23	diff1 \|	\|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/vc/vc-annotate.el	diff1 \|	\|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/process.c	diff1 \|	diff2 \|	blob \| history
src/term.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.